Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modsuits #3013

Merged
merged 67 commits into from
Aug 25, 2024
Merged

Modsuits #3013

merged 67 commits into from
Aug 25, 2024

Conversation

FalloutFalcon
Copy link
Member

@FalloutFalcon FalloutFalcon commented May 20, 2024

About The Pull Request

finishes #1785

Todo

  • Init icons are broken
  • Do afters can be canceled by walking

Why It's Good For The Game

Changelog

🆑 FalloutFalcon, MrSamu99, Fikou
add: a few shipments of MOD control units have found there way to the frontier, premium versions of existing hard suits with the latest tech!
add: Ported modsuits from tg, no mapped stuff yet
/:cl:

@FalloutFalcon FalloutFalcon changed the title Modsuit Modsuits Jul 7, 2024
@FalloutFalcon FalloutFalcon marked this pull request as ready for review July 10, 2024 17:28
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Jul 12, 2024
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Jul 14, 2024
@FalloutFalcon FalloutFalcon added Test Merged They've done it for free. and removed Test Merge Candidate You do it for free. Test Merge Required They'll have to do it for free. labels Jul 14, 2024
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Jul 15, 2024
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Jul 17, 2024
@thgvr thgvr added this pull request to the merge queue Jul 30, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to a conflict with the base branch Jul 30, 2024
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Jul 30, 2024
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Aug 8, 2024
@thgvr thgvr added this pull request to the merge queue Aug 25, 2024
Merged via the queue into shiptest-ss13:master with commit 7ffce90 Aug 25, 2024
17 checks passed
MysticalFaceLesS pushed a commit to CeladonSS13/Shiptest that referenced this pull request Aug 26, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->
finishes shiptest-ss13#1785

Todo

- [x] Init icons are broken
- [x] Do afters can be canceled by walking

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

:cl: FalloutFalcon, MrSamu99, Fikou
add: a few shipments of MOD control units have found there way to the
frontier, premium versions of existing hard suits with the latest tech!
add: Ported modsuits from tg, no mapped stuff yet
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Signed-off-by: thgvr <[email protected]>
Signed-off-by: FalloutFalcon <[email protected]>
Co-authored-by: MrSamu99 <[email protected]>
Co-authored-by: MrSamu99 <[email protected]>
Co-authored-by: thgvr <[email protected]>
Constellado pushed a commit to Constellado/PentestOld that referenced this pull request Aug 27, 2024
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

finishes shiptest-ss13#1785

Todo

- [x] Init icons are broken
- [x] Do afters can be canceled by walking

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

:cl: FalloutFalcon, MrSamu99, Fikou
add: a few shipments of MOD control units have found there way to the
frontier, premium versions of existing hard suits with the latest tech!
add: Ported modsuits from tg, no mapped stuff yet
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Signed-off-by: thgvr <[email protected]>
Signed-off-by: FalloutFalcon <[email protected]>
Co-authored-by: MrSamu99 <[email protected]>
Co-authored-by: MrSamu99 <[email protected]>
Co-authored-by: thgvr <[email protected]>
Constellado added a commit to Constellado/PentestOld that referenced this pull request Aug 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code change Watch something violently break. DME Edit Feature REALLY causes more bugs in the future that we won't know about. Sound USSR Anthem 2.66 MB file. Sprites A bikeshed full of soulless bikes. Test Merged They've done it for free. TGUI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants